From da8666d7458a6f2a1bee8bcdb652bb354eb3e110 Mon Sep 17 00:00:00 2001 From: Richard Hult Date: Fri, 16 Jan 2009 19:47:16 +0100 Subject: [PATCH] Clean up the scroll support a little --- gdk/quartz/gdkevents-quartz.c | 38 +++++++++++++++-------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c index bbd1e7d349..1a66a31b69 100644 --- a/gdk/quartz/gdkevents-quartz.c +++ b/gdk/quartz/gdkevents-quartz.c @@ -1807,31 +1807,25 @@ gdk_event_translate (GdkEvent *event, float dy = [nsevent deltaY]; GdkScrollDirection direction; - /* The delta is how much the mouse wheel has moved. Since there's no such thing in GTK+ - * we accomodate by sending a different number of scroll wheel events. - */ - - /* First do y events */ - if (dy < 0.0) - { - dy = -dy; - direction = GDK_SCROLL_DOWN; - } - else - direction = GDK_SCROLL_UP; + if (dy != 0) + { + if (dy < 0.0) + direction = GDK_SCROLL_DOWN; + else + direction = GDK_SCROLL_UP; - fill_scroll_event (window, event, nsevent, direction); + fill_scroll_event (window, event, nsevent, x, y, direction); + } - /* Now do x events */ - if (dx < 0.0) - { - dx = -dx; - direction = GDK_SCROLL_RIGHT; - } - else - direction = GDK_SCROLL_LEFT; + if (dx != 0) + { + if (dx < 0.0) + direction = GDK_SCROLL_RIGHT; + else + direction = GDK_SCROLL_LEFT; - fill_scroll_event (window, event, nsevent, direction); + fill_scroll_event (window, event, nsevent, x, y, direction); + } } break; -- 2.30.2